Auto merge of #1775 - alexcrichton:update-cargo-lock, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 1 Jul 2015 16:59:23 +0000 (16:59 +0000)
committerbors <bors@rust-lang.org>
Wed, 1 Jul 2015 16:59:23 +0000 (16:59 +0000)

Trivial merge